<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-11 08:11:05 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>git mergetool</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Branching_and_Merging">
                                Branching and Merging                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="31835bd64669e9384875ee66708207751297830773536c0d857ad02900aa7a55/62" data-source="git-mergetool" onmousemove="i18n(this)">git-mergetool</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="2cfe75fb6e159b651b892d069b3f0a301ee257dd4074825e46cf4b9a9e87cbb1/dd" data-source="git-mergetool - Run merge conflict resolution tools to resolve merge conflicts" onmousemove="i18n(this)">git-mergetool &mdash; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&tcy;&softcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <div> <pre class="hljs language-css">git mergetool <span class="hljs-selector-attr">[--tool=&lt;tool&gt;]</span> <span class="hljs-selector-attr">[-y | --[no-]</span>prompt] <span class="hljs-selector-attr">[&lt;file&gt;&hellip;&ZeroWidthSpace;]</span></pre> </div> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="8518af54fc1fecceb9622fbd5d4fbb26e175af0ff9f85632e1be56f50723671a/df" data-source="Use &lt;code&gt;git mergetool&lt;/code&gt; to run one of several merge utilities to resolve merge conflicts. It is typically run after &lt;code&gt;git merge&lt;/code&gt;." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>git mergetool</code>  &dcy;&lcy;&yacy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &ocy;&dcy;&ncy;&ocy;&jcy; &icy;&zcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&icy;&khcy; &ucy;&tcy;&icy;&lcy;&icy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ocy;&ncy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy;  <code>git merge</code> .</span></p> <p><span data-i18n="c09348bd46db51c6fdc4fb3714c2e95c07be8f8bce2e0f4907b7c48296d94f4f/99" data-source="If one or more &amp;lt;file&amp;gt; parameters are given, the merge tool program will be run to resolve differences in each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no &amp;lt;file&amp;gt; names are specified, &lt;code&gt;git mergetool&lt;/code&gt; will run the merge tool program on every file with merge conflicts." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &zcy;&acy;&dcy;&acy;&ncy; &ocy;&dcy;&icy;&ncy; &icy;&lcy;&icy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&vcy; &lt;file&gt;, &bcy;&ucy;&dcy;&iecy;&tcy; &zcy;&acy;&pcy;&ucy;&shchcy;&iecy;&ncy;&acy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &ucy;&scy;&tcy;&rcy;&acy;&ncy;&iecy;&ncy;&icy;&yacy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &vcy; &kcy;&acy;&zhcy;&dcy;&ocy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy; (&pcy;&rcy;&ocy;&pcy;&ucy;&scy;&kcy;&acy;&yacy; &tcy;&iecy;, &ucy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &ncy;&iecy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;). &Ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &ncy;&iecy;&rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &pcy;&ocy; &ecy;&tcy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy;. &IEcy;&scy;&lcy;&icy; &icy;&mcy;&iecy;&ncy;&acy; &lt;&fcy;&acy;&jcy;&lcy;&ocy;&vcy;&gt; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ycy;,  <code>git mergetool</code>  &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ucy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &scy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_options"><span data-i18n="d0db8b5e364b6989e4b8f38a2b3846b87d99a51c1592ebf35d21cc66405a8e39/b6" data-source="Options" onmousemove="i18n(this)">Options</span></h2> <div> <div> <dl> <dt id="Documentation/git-mergetool.txt--tlttoolgt"><span data-i18n="fa549b8f83ddff9069c325e35efef6d9d84e2a689a18aea80f3ab4df06f008b6/26" data-source="-t &amp;lt;tool&amp;gt;" onmousemove="i18n(this)">-t &lt;tool&gt;</span></dt> <dt id="Documentation/git-mergetool.txt---toollttoolgt"><span data-i18n="27e49e95f5d87489b3e67e643db4b7d88f09b062276ab06fcd7aae890156a93f/33" data-source="--tool=&amp;lt;tool&amp;gt;" onmousemove="i18n(this)">--tool=&lt;tool&gt;</span></dt> <dd> <p><span data-i18n="77a0ac8c3c3a23849f0408475309ba11e7cc789f90aa4bbfb3662a9b5547b0c4/f2" data-source="Use the merge resolution program specified by &amp;lt;tool&amp;gt;. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run &lt;code&gt;git mergetool --tool-help&lt;/code&gt; for the list of valid &amp;lt;tool&amp;gt; settings." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ucy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;, &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ucy;&yucy; &vcy; &lt;tool&gt;. &Dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;: &laquo;emerge&raquo;, &laquo;gvimdiff&raquo;, &laquo;kdiff3&raquo;, &laquo;meld&raquo;, &laquo;vimdiff&raquo; &icy; &laquo;tortoisemerge&raquo;. &Zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy;  <code>git mergetool --tool-help</code>  &dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&icy;&yacy; &scy;&pcy;&icy;&scy;&kcy;&acy; &dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ycy;&khcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&kcy; &lt;tool&gt;.</span></p> <p><span data-i18n="e2a3b4286cbc96e9aa6f0d5cfc9be269f60be1cbf1c40d46d6bf90e7e4175814/31" data-source="If a merge resolution program is not specified, &lt;code&gt;git mergetool&lt;/code&gt; will use the configuration variable &lt;code&gt;merge.tool&lt;/code&gt;. If the configuration variable &lt;code&gt;merge.tool&lt;/code&gt; is not set, &lt;code&gt;git mergetool&lt;/code&gt; will pick a suitable default." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&acy;,  <code>git mergetool</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.tool</code> . &IEcy;&scy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.tool</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&acy;,  <code>git mergetool</code>  &vcy;&ycy;&bcy;&iecy;&rcy;&iecy;&tcy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> <p><span data-i18n="fd26551e2c7efcf55ad849d67a2a85cdb61ce95991419190b3594e92e36875cd/d1" data-source="You can explicitly provide a full path to the tool by setting the configuration variable &lt;code&gt;mergetool.&amp;lt;tool&amp;gt;.path&lt;/code&gt;. For example, you can configure the absolute path to kdiff3 by setting &lt;code&gt;mergetool.kdiff3.path&lt;/code&gt;. Otherwise, &lt;code&gt;git mergetool&lt;/code&gt; assumes the tool is available in PATH." onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &yacy;&vcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &pcy;&ocy;&lcy;&ncy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &kcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ucy;, &zcy;&acy;&dcy;&acy;&vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.&lt;tool&gt;.path</code> . &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &acy;&bcy;&scy;&ocy;&lcy;&yucy;&tcy;&ncy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy; &kcy; kdiff3, &zcy;&acy;&dcy;&acy;&vcy;  <code>mergetool.kdiff3.path</code> . &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;  <code>git mergetool</code>  &pcy;&rcy;&iecy;&dcy;&pcy;&ocy;&lcy;&acy;&gcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&iecy;&ncy; &vcy; PATH.</span></p> <p><span data-i18n="7d80098091ca4d57a7ce6ebdb185623f3b9db8fe828c0061537c8c357f080701/7f" data-source="Instead of running one of the known merge tool programs, &lt;code&gt;git mergetool&lt;/code&gt; can be customized to run an alternative program by specifying the command line to invoke in a configuration variable &lt;code&gt;mergetool.&amp;lt;tool&amp;gt;.cmd&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&mcy;&iecy;&scy;&tcy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &ocy;&dcy;&ncy;&ocy;&jcy; &icy;&zcy; &icy;&zcy;&vcy;&iecy;&scy;&tcy;&ncy;&ycy;&khcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>git mergetool</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &dcy;&lcy;&yacy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy; &acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ocy;&jcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy;, &ucy;&kcy;&acy;&zcy;&acy;&vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ucy;&yucy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy; &dcy;&lcy;&yacy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.&lt;tool&gt;.cmd</code> .</span></p> <p><span data-i18n="097fbb8bbf9c80f8997ad1b30604e5298d31148d5b2235e2d947823d80f850fa/b1" data-source="When &lt;code&gt;git mergetool&lt;/code&gt; is invoked with this tool (either through the &lt;code&gt;-t&lt;/code&gt; or &lt;code&gt;--tool&lt;/code&gt; option or the &lt;code&gt;merge.tool&lt;/code&gt; configuration variable), the configured command line will be invoked with &lt;code&gt;$BASE&lt;/code&gt; set to the name of a temporary file containing the common base for the merge, if available; &lt;code&gt;$LOCAL&lt;/code&gt; set to the name of a temporary file containing the contents of the file on the current branch; &lt;code&gt;$REMOTE&lt;/code&gt; set to the name of a temporary file containing the contents of the file to be merged, and &lt;code&gt;$MERGED&lt;/code&gt; set to the name of the file to which the merge tool should write the result of the merge resolution." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  <code>git mergetool</code>  &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ecy;&tcy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; (&lcy;&icy;&bcy;&ocy; &chcy;&iecy;&rcy;&iecy;&zcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;  <code>-t</code>  &icy;&lcy;&icy;  <code>--tool</code> , &lcy;&icy;&bcy;&ocy; &chcy;&iecy;&rcy;&iecy;&zcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.tool</code> ), &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&acy; &scy;  <code>$BASE</code> , &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy; &ncy;&acy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &ocy;&bcy;&shchcy;&ucy;&yucy; &bcy;&acy;&zcy;&ucy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &iecy;&scy;&lcy;&icy; &tcy;&acy;&kcy;&ocy;&vcy;&acy;&yacy; &icy;&mcy;&iecy;&iecy;&tcy;&scy;&yacy;;  <code>$LOCAL</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;; &Dcy;&lcy;&yacy;  <code>$REMOTE</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy;, &pcy;&ocy;&dcy;&lcy;&iecy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yucy;, &acy; &dcy;&lcy;&yacy;  <code>$MERGED</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &zcy;&acy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="2b8594f63cdf3a446a7330bf5a0a78b834918d5e2a5ea7d2aea92b1b28b86161/ec" data-source="If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable &lt;code&gt;mergetool.&amp;lt;tool&amp;gt;.trustExitCode&lt;/code&gt; can be set to &lt;code&gt;true&lt;/code&gt;. Otherwise, &lt;code&gt;git mergetool&lt;/code&gt; will prompt the user to indicate the success of the resolution after the custom tool has exited." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &ncy;&acy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&vcy;&ocy;&icy;&mcy; &kcy;&ocy;&dcy;&ocy;&mcy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy;, &tcy;&ocy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.&lt;tool&gt;.trustExitCode</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>true</code>  . &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;  <code>git mergetool</code>  &pcy;&rcy;&iecy;&dcy;&lcy;&ocy;&zhcy;&icy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&scy;&tcy;&softcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &icy;&zcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt---tool-help"><span data-i18n="d923596834de9f3ac04d4a9376a78b08f9fe3c4ba7197c791d497fba8a103e6c/3c" data-source="--tool-help" onmousemove="i18n(this)">--tool-help</span></dt> <dd> <p><span data-i18n="f00001c0628ec16d0492ab0e5fcfd0c45184fc4dd33fad64be109aa62b35688b/e0" data-source="Print a list of merge tools that may be used with &lt;code&gt;--tool&lt;/code&gt;." onmousemove="i18n(this)">&Rcy;&acy;&scy;&pcy;&iecy;&chcy;&acy;&tcy;&acy;&jcy;&tcy;&iecy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;  <code>--tool</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt--y"><span data-i18n="6287c641a5597c1f18b6da8e4df91bfffc6a66bccf10561174a00116059b5735/a3" data-source="-y" onmousemove="i18n(this)">-y</span></dt> <dt id="Documentation/git-mergetool.txt---no-prompt"><span data-i18n="38a33d6a8c15a9adc4b28cdc0c5c1fa07aba9e8a5df8b5812111b3af20149010/f8" data-source="--no-prompt" onmousemove="i18n(this)">--no-prompt</span></dt> <dd> <p><span data-i18n="03955805716ddc066369a95f2139ec26318da8dd9332c5021c078fab8dd2f999/c5" data-source="Don&amp;rsquo;t prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly specified with the &lt;code&gt;--tool&lt;/code&gt; option or with the &lt;code&gt;merge.tool&lt;/code&gt; configuration variable." onmousemove="i18n(this)">&Ncy;&iecy; &zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&jcy;&tcy;&iecy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &pcy;&iecy;&rcy;&iecy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;. &Ecy;&tcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &iecy;&scy;&lcy;&icy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &yacy;&vcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&acy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy;  <code>--tool</code>  &icy;&lcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.tool</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt---prompt"><span data-i18n="420da8063e51b09b73d521127015059543e5d256e9f25f6ae676d8241831ee61/67" data-source="--prompt" onmousemove="i18n(this)">--prompt</span></dt> <dd> <p><span data-i18n="4783187ddee3f875d07453b58233bbe14c67a5cb04bca674ed275dd3e2004e01/bd" data-source="Prompt before each invocation of the merge resolution program to give the user a chance to skip the path." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&tcy;&softcy; &zcy;&acy;&pcy;&rcy;&ocy;&scy; &pcy;&iecy;&rcy;&iecy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &dcy;&acy;&tcy;&softcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy; &pcy;&rcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&softcy; &pcy;&ucy;&tcy;&softcy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt--g"><span data-i18n="e34b6f1266cf79b5e6ed49b1038dbe26f8da6d09bb556143ca2e4fb0a4ad065c/06" data-source="-g" onmousemove="i18n(this)">-g</span></dt> <dt id="Documentation/git-mergetool.txt---gui"><span data-i18n="179c1d54ed52344e470de39f69dd12214683abd46aed1e02e1590eb8989c6618/fc" data-source="--gui" onmousemove="i18n(this)">--gui</span></dt> <dd> <p><span data-i18n="74bc1e31c115001a27fd13548fc5c2593daba40f8b8a6faf695bd749dec7f1df/06" data-source="When &lt;code&gt;git-mergetool&lt;/code&gt; is invoked with the &lt;code&gt;-g&lt;/code&gt; or &lt;code&gt;--gui&lt;/code&gt; option, the default merge tool will be read from the configured &lt;code&gt;merge.guitool&lt;/code&gt; variable instead of &lt;code&gt;merge.tool&lt;/code&gt;. If &lt;code&gt;merge.guitool&lt;/code&gt; is not set, we will fallback to the tool configured under &lt;code&gt;merge.tool&lt;/code&gt;. This may be autoselected using the configuration variable &lt;code&gt;mergetool.guiDefault&lt;/code&gt;." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  <code>git-mergetool</code>  &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &ocy;&pcy;&tscy;&icy;&iecy;&jcy;  <code>-g</code>  &icy;&lcy;&icy;  <code>--gui</code> , &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &icy;&zcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy;  <code>merge.guitool</code>  &vcy;&mcy;&iecy;&scy;&tcy;&ocy;  <code>merge.tool</code> . &IEcy;&scy;&lcy;&icy;  <code>merge.guitool</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;, &mcy;&ycy; &vcy;&iecy;&rcy;&ncy;&iecy;&mcy;&scy;&yacy; &kcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ucy;, &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&mcy;&ucy; &pcy;&ocy;&dcy;  <code>merge.tool</code> . &Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&ycy;&bcy;&rcy;&acy;&tcy;&softcy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.guiDefault</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt---no-gui"><span data-i18n="7d2ecd028622234122256684e0cfe1c8f09aed92d4899b32ca009ff63538dc73/fa" data-source="--no-gui" onmousemove="i18n(this)">--no-gui</span></dt> <dd> <p><span data-i18n="065b869f5550755f1008aa02b8dfac64b3a25eaa2c7f6da2b095179d92c8f1d9/9a" data-source="This overrides a previous &lt;code&gt;-g&lt;/code&gt; or &lt;code&gt;--gui&lt;/code&gt; setting or &lt;code&gt;mergetool.guiDefault&lt;/code&gt; configuration and reads the default merge tool from the configured &lt;code&gt;merge.tool&lt;/code&gt; variable." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&ucy;&yucy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&ucy;  <code>-g</code>  &icy;&lcy;&icy;  <code>--gui</code>  &icy;&lcy;&icy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&yucy;  <code>mergetool.guiDefault</code>  &icy; &scy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&zcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy;  <code>merge.tool</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt--Oltorderfilegt"><span data-i18n="fb24b9301bc95f99e1c5b3f79969c0eb9d877bac2e7528ac4b15bd1b11341be3/5c" data-source="-O&amp;lt;orderfile&amp;gt;" onmousemove="i18n(this)">-O&lt;orderfile&gt;</span></dt> <dd> <p><span data-i18n="356a21c2f06e95f1a10ebc810fc0c4d4bd391fc7ef8b0bbffeaeeb2b1ec7a78c/41" data-source="Process files in the order specified in the &amp;lt;orderfile&amp;gt;, which has one shell glob pattern per line. This overrides the &lt;code&gt;diff.orderFile&lt;/code&gt; configuration variable (see &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). To cancel &lt;code&gt;diff.orderFile&lt;/code&gt;, use &lt;code&gt;-O/dev/null&lt;/code&gt;." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&jcy;&tcy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&iecy;, &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&mcy; &vcy; &lt;orderfile&gt;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&mcy;&iecy;&iecy;&tcy; &ocy;&dcy;&icy;&ncy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &ocy;&bcy;&ocy;&lcy;&ocy;&chcy;&kcy;&icy; &vcy; &kcy;&acy;&zhcy;&dcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;. &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>diff.orderFile</code>  (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ). &CHcy;&tcy;&ocy;&bcy;&ycy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;  <code>diff.orderFile</code> , &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>-O/dev/null</code> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_configuration"><span data-i18n="b332c3492d5eb10a118eb6d8b0dcd689bc2477ce2ae16b303753b942b54377bc/aa" data-source="Configuration" onmousemove="i18n(this)">Configuration</span></h2> <div> <p><span data-i18n="5b8d919fa35b75aa925ebd5414ed6373e762fb0a087a062961c27b2ce9586555/57" data-source="Everything below this line in this section is selectively included from the &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt; documentation. The content is the same as what&amp;rsquo;s found there:" onmousemove="i18n(this)">&Vcy;&scy;&iecy;, &chcy;&tcy;&ocy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &ncy;&icy;&zhcy;&iecy; &ecy;&tcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;, &vcy;&ycy;&bcy;&ocy;&rcy;&ocy;&chcy;&ncy;&ocy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &icy;&zcy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&tscy;&icy;&icy;  <a href="git-config.html">git-config[1]</a> . &Scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&icy;&iecy; &tcy;&acy;&kcy;&ocy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &ncy;&acy;&jcy;&dcy;&iecy;&ncy;&ncy;&ocy;&iecy; &tcy;&acy;&mcy;:</span></p> <div> <dl> <dt id="Documentation/git-mergetool.txt-mergetoollttoolgtpath"><span data-i18n="3509d6a64d7003dbdbb5b04d68d7957f40881c9fcfdfff4e6406bb32437ecaab/69" data-source="mergetool.&amp;lt;tool&amp;gt;.path" onmousemove="i18n(this)">mergetool.&lt;tool&gt;.path</span></dt> <dd> <p><span data-i18n="6c856ef0157c6ed59b710655d92f69ad49dd0e03d2545aecd49c0f8e764dee23/83" data-source="Override the path for the given tool. This is useful in case your tool is not in the PATH." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &pcy;&ucy;&tcy;&softcy; &dcy;&lcy;&yacy; &dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ocy;, &iecy;&scy;&lcy;&icy; &vcy;&acy;&shcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &vcy; PATH.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoollttoolgtcmd"><span data-i18n="46d356c0951068fcadb1957b8a274dee0cb9baf0749f51eb6780bc4aaa151829/c9" data-source="mergetool.&amp;lt;tool&amp;gt;.cmd" onmousemove="i18n(this)">mergetool.&lt;tool&gt;.cmd</span></dt> <dd> <p><span data-i18n="bc822d7d21ea4ac472b1b25a201dc24d3e44b2d4715d0740ac44b0c73c09403e/5a" data-source="Specify the command to invoke the specified merge tool. The specified command is evaluated in shell with the following variables available: &lt;code&gt;BASE&lt;/code&gt; is the name of a temporary file containing the common base of the files to be merged, if available; &lt;code&gt;LOCAL&lt;/code&gt; is the name of a temporary file containing the contents of the file on the current branch; &lt;code&gt;REMOTE&lt;/code&gt; is the name of a temporary file containing the contents of the file from the branch being merged; &lt;code&gt;MERGED&lt;/code&gt; contains the name of the file to which the merge tool should write the results of a successful merge." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &dcy;&lcy;&yacy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &ocy;&tscy;&iecy;&ncy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &ocy;&bcy;&ocy;&lcy;&ocy;&chcy;&kcy;&iecy; &scy;&ocy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&mcy;&icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy;:  <code>BASE</code>  &mdash; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &ocy;&bcy;&shchcy;&ucy;&yucy; &bcy;&acy;&zcy;&ucy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &iecy;&scy;&lcy;&icy; &tcy;&acy;&kcy;&ocy;&vcy;&acy;&yacy; &icy;&mcy;&iecy;&iecy;&tcy;&scy;&yacy;;  <code>LOCAL</code>  &mdash; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;;  <code>REMOTE</code>  &mdash; &icy;&mcy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; &icy;&zcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&mcy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy;;  <code>MERGED</code>  &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &zcy;&acy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ycy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoollttoolgthideResolved"><span data-i18n="256876a10b4f77b91645fd8d4cd11c7af7a312c06b5a13b9c32c205be1419222/ef" data-source="mergetool.&amp;lt;tool&amp;gt;.hideResolved" onmousemove="i18n(this)">mergetool.&lt;tool&gt;.hideResolved</span></dt> <dd> <p><span data-i18n="8ced93272908b8923fc25895c8a80dbad4262894b5421384d8f0a24328d95324/ea" data-source="Allows the user to override the global &lt;code&gt;mergetool.hideResolved&lt;/code&gt; value for a specific tool. See &lt;code&gt;mergetool.hideResolved&lt;/code&gt; for the full description." onmousemove="i18n(this)">&Pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &gcy;&lcy;&ocy;&bcy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>mergetool.hideResolved</code>  &dcy;&lcy;&yacy; &kcy;&ocy;&ncy;&kcy;&rcy;&iecy;&tcy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;. &Pcy;&ocy;&lcy;&ncy;&ocy;&iecy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&iecy; &scy;&mcy;. &vcy;  <code>mergetool.hideResolved</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoollttoolgttrustExitCode"><span data-i18n="145210bae8882f68da8104b671c279eb3190c8ca007d5636786b26877fd57902/43" data-source="mergetool.&amp;lt;tool&amp;gt;.trustExitCode" onmousemove="i18n(this)">mergetool.&lt;tool&gt;.trustExitCode</span></dt> <dd> <p><span data-i18n="1ca5ad0680377469cd5a25c174a0ec8928f718fc8c341c8363e7db726bef4651/d5" data-source="For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked, and the merge is assumed to have been successful if the file has been updated; otherwise, the user is prompted to indicate the success of the merge." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&jcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy;, &mcy;&ocy;&zhcy;&ncy;&ocy; &lcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&dcy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy; &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  true , &tcy;&ocy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &mcy;&iecy;&tcy;&kcy;&acy; &tscy;&iecy;&lcy;&iecy;&vcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &icy; &scy;&chcy;&icy;&tcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&rcy;&ocy;&shcy;&lcy;&ocy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;, &iecy;&scy;&lcy;&icy; &fcy;&acy;&jcy;&lcy; &bcy;&ycy;&lcy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;; &vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&rcy;&iecy;&dcy;&lcy;&ocy;&zhcy;&iecy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&scy;&tcy;&softcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolmeldhasOutput"><span data-i18n="907b5baec14da12ab4f7ab2a3e74f3b66b6f96b4c529b92ad133438fd23e3ba8/40" data-source="mergetool.meld.hasOutput" onmousemove="i18n(this)">mergetool.meld.hasOutput</span></dt> <dd> <p><span data-i18n="83d6c8a9251b88787839a545e642921f0f6579998ba16918d7046b74ec9adca7/d7" data-source="Older versions of &lt;code&gt;meld&lt;/code&gt; do not support the &lt;code&gt;--output&lt;/code&gt; option. Git will attempt to detect whether &lt;code&gt;meld&lt;/code&gt; supports &lt;code&gt;--output&lt;/code&gt; by inspecting the output of &lt;code&gt;meld --help&lt;/code&gt;. Configuring &lt;code&gt;mergetool.meld.hasOutput&lt;/code&gt; will make Git skip these checks and use the configured value instead. Setting &lt;code&gt;mergetool.meld.hasOutput&lt;/code&gt; to &lt;code&gt;true&lt;/code&gt; tells Git to unconditionally use the &lt;code&gt;--output&lt;/code&gt; option, and &lt;code&gt;false&lt;/code&gt; avoids using &lt;code&gt;--output&lt;/code&gt;." onmousemove="i18n(this)">&Bcy;&ocy;&lcy;&iecy;&iecy; &scy;&tcy;&acy;&rcy;&ycy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  <code>meld</code>  &ncy;&iecy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&yucy;&tcy; &ocy;&pcy;&tscy;&icy;&yucy;  <code>--output</code> .  Git  &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &lcy;&icy;  <code>meld</code> <code>--output</code> , &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&vcy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;  <code>meld --help</code> . &Pcy;&rcy;&icy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&iecy;  <code>mergetool.meld.hasOutput</code>   Git  &pcy;&rcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&tcy; &ecy;&tcy;&icy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy; &icy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;. &Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy;  <code>mergetool.meld.hasOutput</code>  &vcy;  <code>true</code>  &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;  Git  &bcy;&iecy;&zcy;&ocy;&gcy;&ocy;&vcy;&ocy;&rcy;&ocy;&chcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ocy;&pcy;&tscy;&icy;&yucy;  <code>--output</code> , &acy;  <code>false</code>  &icy;&zcy;&bcy;&iecy;&gcy;&acy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;  <code>--output</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolmelduseAutoMerge"><span data-i18n="3200cbc2e4561907f7a3160edf4c17a0636286bb688092ce71b1ea640d7d236e/c1" data-source="mergetool.meld.useAutoMerge" onmousemove="i18n(this)">mergetool.meld.useAutoMerge</span></dt> <dd> <p><span data-i18n="789311e629e724934d762375448db762abf2701787d0af3e00e18614a82793bf/4b" data-source="When the &lt;code&gt;--auto-merge&lt;/code&gt; is given, meld will merge all non-conflicting parts automatically, highlight the conflicting parts, and wait for user decision. Setting &lt;code&gt;mergetool.meld.useAutoMerge&lt;/code&gt; to &lt;code&gt;true&lt;/code&gt; tells Git to unconditionally use the &lt;code&gt;--auto-merge&lt;/code&gt; option with &lt;code&gt;meld&lt;/code&gt;. Setting this value to &lt;code&gt;auto&lt;/code&gt; makes git detect whether &lt;code&gt;--auto-merge&lt;/code&gt; is supported and will only use &lt;code&gt;--auto-merge&lt;/code&gt; when available. A value of &lt;code&gt;false&lt;/code&gt; avoids using &lt;code&gt;--auto-merge&lt;/code&gt; altogether, and is the default value." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy; &zcy;&acy;&dcy;&acy;&ncy;  <code>--auto-merge</code> , &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yacy; Meld &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy; &vcy;&scy;&iecy; &ncy;&iecy;&kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&iecy; &chcy;&acy;&scy;&tcy;&icy;, &vcy;&ycy;&dcy;&iecy;&lcy;&icy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&iecy; &chcy;&acy;&scy;&tcy;&icy; &icy; &bcy;&ucy;&dcy;&iecy;&tcy; &zhcy;&dcy;&acy;&tcy;&softcy; &rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy;. &Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy;  <code>mergetool.meld.useAutoMerge</code>  &vcy;  <code>true</code>  &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;  Git  &bcy;&iecy;&zcy;&ocy;&gcy;&ocy;&vcy;&ocy;&rcy;&ocy;&chcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ocy;&pcy;&tscy;&icy;&yucy;  <code>--auto-merge</code>  &scy;  <code>meld</code> . &Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy; &ecy;&tcy;&ocy;&gcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &ncy;&acy;  <code>auto</code>  &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy;  git  &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&tcy;&softcy;, &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &lcy;&icy;  <code>--auto-merge</code> , &icy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>--auto-merge</code>  &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&rcy;&icy; &iecy;&gcy;&ocy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ocy;&scy;&tcy;&icy;. &Zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>false</code>  &vcy;&ocy;&ocy;&bcy;&shchcy;&iecy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;  <code>--auto-merge</code>  &icy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolvimdifflayout"><span data-i18n="42233d7422c709b4586de00572a369ac2c33b0b9d503f30cdc0bf96a7b4d3e9a/f5" data-source="mergetool.vimdiff.layout" onmousemove="i18n(this)">mergetool.vimdiff.layout</span></dt> <dd> <p><span data-i18n="9296554282d6f00f505b0938609fecec4283b0550469079d9fce3e1f7cd9e720/6a" data-source="The vimdiff backend uses this variable to control how its split windows appear. Applies even if you are using Neovim (&lt;code&gt;nvim&lt;/code&gt;) or gVim (&lt;code&gt;gvim&lt;/code&gt;) as the merge tool. See BACKEND SPECIFIC HINTS section for details." onmousemove="i18n(this)">&Scy;&iecy;&rcy;&vcy;&iecy;&rcy;&ncy;&acy;&yacy; &chcy;&acy;&scy;&tcy;&softcy; vimdiff &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ecy;&tcy;&ucy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &dcy;&lcy;&yacy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &ocy;&kcy;&ocy;&ncy;. &Pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy;, &dcy;&acy;&zhcy;&iecy; &iecy;&scy;&lcy;&icy; &vcy;&ycy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&iecy; Neovim (  <code>nvim</code>  ) &icy;&lcy;&icy; gVim (  <code>gvim</code>  ) &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy; &laquo;&Scy;&Pcy;&IEcy;&TScy;&Icy;&Fcy;&Icy;&CHcy;&IEcy;&Scy;&Kcy;&Icy;&IEcy; &Scy;&Ocy;&Vcy;&IEcy;&Tcy;&Ycy; &Dcy;&Lcy;&YAcy; BACKEND&raquo;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolhideResolved"><span data-i18n="d94a5296e75a97604ed40d824b6ffb3badf43b5fb3bdbd508ffadc6df73e201d/78" data-source="mergetool.hideResolved" onmousemove="i18n(this)">mergetool.hideResolved</span></dt> <dd> <p><span data-i18n="f1c52a6be699ed643fdca298b0202f885894df0bdd732d1daed4a59eb3ab556e/4c" data-source="During a merge, Git will automatically resolve as many conflicts as possible and write the &lt;code&gt;MERGED&lt;/code&gt; file containing conflict markers around any conflicts that it cannot resolve; &lt;code&gt;LOCAL&lt;/code&gt; and &lt;code&gt;REMOTE&lt;/code&gt; normally represent the versions of the file from before Git&amp;rsquo;s conflict resolution. This flag causes &lt;code&gt;LOCAL&lt;/code&gt; and &lt;code&gt;REMOTE&lt;/code&gt; to be overwritten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the &lt;code&gt;mergetool.&amp;lt;tool&amp;gt;.hideResolved&lt;/code&gt; configuration variable. Defaults to &lt;code&gt;false&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  Git  &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&iecy;&tcy; &mcy;&acy;&kcy;&scy;&icy;&mcy;&acy;&lcy;&softcy;&ncy;&ocy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&iecy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&ocy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &icy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;  <code>MERGED</code> , &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&icy;&jcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;, &vcy;&ocy;&kcy;&rcy;&ucy;&gcy; &lcy;&yucy;&bcy;&ycy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&ncy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&icy;&tcy;&softcy;;  <code>LOCAL</code>  &icy;  <code>REMOTE</code>  &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&tcy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&acy; &dcy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;  Git . &Ecy;&tcy;&ocy;&tcy; &fcy;&lcy;&acy;&gcy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&icy;&scy;&icy;  <code>LOCAL</code>  &icy;  <code>REMOTE</code> , &tcy;&acy;&kcy; &chcy;&tcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ncy;&iecy;&rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &chcy;&iecy;&rcy;&iecy;&zcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.&lt;tool&gt;.hideResolved</code> . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>false</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolkeepBackup"><span data-i18n="c11c9138955f44695941961a4dc350bc14ba173c6f07965cbf8d769177e38201/cb" data-source="mergetool.keepBackup" onmousemove="i18n(this)">mergetool.keepBackup</span></dt> <dd> <p><span data-i18n="c605fd72fc989289b010a93908282d588dd0664969e0ac05ec7ba8d84135e991/e4" data-source="After performing a merge, the original file with conflict markers can be saved as a file with a &lt;code&gt;.orig&lt;/code&gt; extension. If this variable is set to &lt;code&gt;false&lt;/code&gt; then this file is not preserved. Defaults to &lt;code&gt;true&lt;/code&gt; (i.e. keep the backup files)." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy; &scy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;&mcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy; &kcy;&acy;&kcy; &fcy;&acy;&jcy;&lcy; &scy; &rcy;&acy;&scy;&shcy;&icy;&rcy;&iecy;&ncy;&icy;&iecy;&mcy;  <code>.orig</code> . &IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>false</code> , &ecy;&tcy;&ocy;&tcy; &fcy;&acy;&jcy;&lcy; &ncy;&iecy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>true</code>  (&tcy;.&iecy;. &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&iecy;&zcy;&iecy;&rcy;&vcy;&ncy;&ycy;&khcy; &kcy;&ocy;&pcy;&icy;&jcy;).</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolkeepTemporaries"><span data-i18n="2257ad974773ae6cd0a0670d96522c710c68b02d54afdd32584582fa65714bb9/09" data-source="mergetool.keepTemporaries" onmousemove="i18n(this)">mergetool.keepTemporaries</span></dt> <dd> <p><span data-i18n="51c74ebc6a2bbb8e4e46c540f66caabecc36d0bee4f57d30b86ffd0c2189b09b/cd" data-source="When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to &lt;code&gt;true&lt;/code&gt;, then these temporary files will be preserved; otherwise, they will be removed after the tool has exited. Defaults to &lt;code&gt;false&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &vcy;&ycy;&zcy;&ocy;&vcy;&iecy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ncy;&acy;&bcy;&ocy;&rcy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&chcy;&icy; &ecy;&tcy;&ocy;&mcy;&ucy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ucy;. &IEcy;&scy;&lcy;&icy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy; &icy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&jcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>true</code> , &ecy;&tcy;&icy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &bcy;&ucy;&dcy;&ucy;&tcy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&iecy;&ncy;&ycy;; &vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ocy;&ncy;&icy; &bcy;&ucy;&dcy;&ucy;&tcy; &ucy;&dcy;&acy;&lcy;&iecy;&ncy;&ycy; &pcy;&ocy;&scy;&lcy;&iecy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &icy;&zcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>false</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolwriteToTemp"><span data-i18n="298d46d445555c4d7f2e4e2ed07a921c70ba464f04029e29eaccaa72de4cb680/11" data-source="mergetool.writeToTemp" onmousemove="i18n(this)">mergetool.writeToTemp</span></dt> <dd> <p><span data-i18n="ff5f20c095905d84a7d064134a9b0cf49b1653a300e5c727d39eaa8eac1e36e7/54" data-source="Git writes temporary &lt;code&gt;BASE&lt;/code&gt;, &lt;code&gt;LOCAL&lt;/code&gt;, and &lt;code&gt;REMOTE&lt;/code&gt; versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set &lt;code&gt;true&lt;/code&gt;. Defaults to &lt;code&gt;false&lt;/code&gt;." onmousemove="i18n(this)">Git  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&icy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;  <code>BASE</code> ,  <code>LOCAL</code>  &icy;  <code>REMOTE</code>  &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&iecy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy;.  Git  &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&jcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy; &dcy;&lcy;&yacy; &ecy;&tcy;&icy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &iecy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy;  <code>true</code> . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;  <code>false</code> .</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolprompt"><span data-i18n="8cc0a36a2ef095c520cdac7c1f118a7d42807ef11e54106d28bde3180d6a6de7/8b" data-source="mergetool.prompt" onmousemove="i18n(this)">mergetool.prompt</span></dt> <dd> <p><span data-i18n="5a9b23b0d99d67d2300fd42df8f0b9eeff79688feab0af5f8a601850bd4335d1/48" data-source="Prompt before each invocation of the merge resolution program." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &vcy;&ycy;&zcy;&ocy;&vcy;&ocy;&mcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;.</span></p> </dd> <dt id="Documentation/git-mergetool.txt-mergetoolguiDefault"><span data-i18n="9ab8ecd70aad889a35686ef5a16e439f3977776aa5fe668e49094dcee86df42a/ad" data-source="mergetool.guiDefault" onmousemove="i18n(this)">mergetool.guiDefault</span></dt> <dd> <p><span data-i18n="e307b85a44109131a0addca99c3ee763742f5e900288285dc4df050f73df6594/17" data-source="Set &lt;code&gt;true&lt;/code&gt; to use the &lt;code&gt;merge.guitool&lt;/code&gt; by default (equivalent to specifying the &lt;code&gt;--gui&lt;/code&gt; argument), or &lt;code&gt;auto&lt;/code&gt; to select &lt;code&gt;merge.guitool&lt;/code&gt; or &lt;code&gt;merge.tool&lt;/code&gt; depending on the presence of a &lt;code&gt;DISPLAY&lt;/code&gt; environment variable value. The default is &lt;code&gt;false&lt;/code&gt;, where the &lt;code&gt;--gui&lt;/code&gt; argument must be provided explicitly for the &lt;code&gt;merge.guitool&lt;/code&gt; to be used." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy;  <code>true</code>  &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;  <code>merge.guitool</code>  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; (&ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yucy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;  <code>--gui</code> ) &icy;&lcy;&icy;  <code>auto</code>  &dcy;&lcy;&yacy; &vcy;&ycy;&bcy;&ocy;&rcy;&acy;  <code>merge.guitool</code>  &icy;&lcy;&icy;  <code>merge.tool</code>  &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &ncy;&acy;&lcy;&icy;&chcy;&icy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&rcy;&iecy;&dcy;&ycy;  <code>DISPLAY</code> . &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy;  <code>false</code>  , &gcy;&dcy;&iecy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy;  <code>--gui</code>  &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &bcy;&ycy;&tcy;&softcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &yacy;&vcy;&ncy;&ocy;, &chcy;&tcy;&ocy;&bcy;&ycy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ycy;&lcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>merge.guitool</code> .</span></p> </dd> </dl> </div> </div> <h2 class="text-body-emphasis"  id="_temporary_files"><span data-i18n="5e55ac4eef29a398aebf4d775d129b620e72ee11b47853692db9b6a2ed458374/1c" data-source="Temporary files" onmousemove="i18n(this)">Temporary files</span></h2> <div> <p><span data-i18n="482730210e461469d85af9bb296eb3f25d6821128cf86ca6ea48e6689b868b70/e6" data-source="&lt;code&gt;git mergetool&lt;/code&gt; creates &lt;code&gt;*.orig&lt;/code&gt; backup files while resolving merges. These are safe to remove once a file has been merged and its &lt;code&gt;git mergetool&lt;/code&gt; session has completed." onmousemove="i18n(this)"><code>git mergetool</code>  &scy;&ocy;&zcy;&dcy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&iecy;&zcy;&iecy;&rcy;&vcy;&ncy;&ycy;&khcy; &kcy;&ocy;&pcy;&icy;&jcy;  <code>*.orig</code>  &pcy;&rcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;. &Icy;&khcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy; &ucy;&dcy;&acy;&lcy;&icy;&tcy;&softcy; &pcy;&ocy;&scy;&lcy;&iecy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &icy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &iecy;&gcy;&ocy; &scy;&iecy;&acy;&ncy;&scy;&acy;  <code>git mergetool</code> .</span></p> <p><span data-i18n="704b8ad74e0c449d90f5a3fe91bbdfa01a98b207d5a49ac147a0f17d14fa375f/4f" data-source="Setting the &lt;code&gt;mergetool.keepBackup&lt;/code&gt; configuration variable to &lt;code&gt;false&lt;/code&gt; causes &lt;code&gt;git mergetool&lt;/code&gt; to automatically remove the backup files as files are successfully merged." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.keepBackup</code>  &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;  <code>false</code>  &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy;  <code>git mergetool</code>  &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &ucy;&dcy;&acy;&lcy;&yacy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&iecy;&zcy;&iecy;&rcy;&vcy;&ncy;&ycy;&khcy; &kcy;&ocy;&pcy;&icy;&jcy; &pcy;&rcy;&icy; &ucy;&scy;&pcy;&iecy;&shcy;&ncy;&ocy;&mcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_backend_specific_hints"><span data-i18n="1ce0a805dce99e5a8d33abfc7075e8ad0a86ea672471bb365d9d469b06150507/5b" data-source="Backend specific hints" onmousemove="i18n(this)">&Kcy;&ocy;&ncy;&kcy;&rcy;&iecy;&tcy;&ncy;&ycy;&iecy; &pcy;&ocy;&dcy;&scy;&kcy;&acy;&zcy;&kcy;&icy; &pcy;&ocy; &bcy;&ecy;&kcy;&ecy;&ncy;&dcy;&ucy;</span></h2> <div> <div> <h3 class="text-body-emphasis"  id="_vimdiff"><span data-i18n="40baf55746dea9a755e4292187065554679f6141ffadf406a6682d166bd94dad/54" data-source="vimdiff" onmousemove="i18n(this)">vimdiff</span></h3> <div> <h4 class="text-body-emphasis"  id="_description_2"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h4> <p><span data-i18n="cf174638d8b8791a0858d9e4326b387b6969ce49e72521173eac8066b955f7ac/12" data-source="When specifying &lt;code&gt;--tool=vimdiff&lt;/code&gt; in &lt;code&gt;git mergetool&lt;/code&gt; Git will open Vim with a 4 windows layout distributed in the following way:" onmousemove="i18n(this)">&Pcy;&rcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&icy;  <code>--tool=vimdiff</code>  &vcy;  <code>git mergetool</code>   Git  &ocy;&tcy;&kcy;&rcy;&ocy;&iecy;&tcy; Vim &scy; 4-&mcy;&yacy; &ocy;&kcy;&ncy;&acy;&mcy;&icy;, &rcy;&acy;&scy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:</span></p> <div> <div> <pre class="hljs language-markdown">------------------------------------------
|             |           |              |
|   LOCAL     |   BASE    |   REMOTE     |
<span class="hljs-section">|             |           |              |
------------------------------------------</span>
|                                        |
|                MERGED                  |
<span class="hljs-section">|                                        |
------------------------------------------</span></pre> </div> </div> <p><span data-i18n="86e4b7fc40eade452a0d4ca66b995e9887acf924c79d7c31ae455ac1dd910b25/90" data-source="&lt;code&gt;LOCAL&lt;/code&gt;, &lt;code&gt;BASE&lt;/code&gt; and &lt;code&gt;REMOTE&lt;/code&gt; are read-only buffers showing the contents of the conflicting file in specific commits (&amp;quot;commit you are merging into&amp;quot;, &amp;quot;common ancestor commit&amp;quot; and &amp;quot;commit you are merging from&amp;quot; respectively)" onmousemove="i18n(this)"><code>LOCAL</code> ,  <code>BASE</code>  &icy;  <code>REMOTE</code>  &mdash; &bcy;&ucy;&fcy;&iecy;&rcy;&ycy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&lcy;&yacy; &chcy;&tcy;&iecy;&ncy;&icy;&yacy;, &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&yucy;&shchcy;&icy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &vcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &kcy;&ocy;&mcy;&mcy;&icy;&tcy;&acy;&khcy; ( &quot;commit you are merging into&quot; ,  &quot;common ancestor commit&quot;  &icy;  &quot;commit you are merging from&quot;  &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;).</span></p> <p><span data-i18n="d8890277c31256d09cbf72bec12d35f9b40fa7301a674b11deaeda3f74bcad8e/05" data-source="&lt;code&gt;MERGED&lt;/code&gt; is a writable buffer where you have to resolve the conflicts (using the other read-only buffers as a reference). Once you are done, save and exit Vim as usual (&lt;code&gt;:wq&lt;/code&gt;) or, if you want to abort, exit using &lt;code&gt;:cq&lt;/code&gt;." onmousemove="i18n(this)"><code>MERGED</code>  &mdash; &ecy;&tcy;&ocy; &zcy;&acy;&pcy;&icy;&scy;&ycy;&vcy;&acy;&iecy;&mcy;&ycy;&jcy; &bcy;&ucy;&fcy;&iecy;&rcy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; (&icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &ocy;&bcy;&rcy;&acy;&zcy;&tscy;&acy; &dcy;&rcy;&ucy;&gcy;&icy;&iecy; &bcy;&ucy;&fcy;&iecy;&rcy;&ycy;, &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&iecy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &dcy;&lcy;&yacy; &chcy;&tcy;&iecy;&ncy;&icy;&yacy;). &Kcy;&ocy;&gcy;&dcy;&acy; &vcy;&ycy; &zcy;&acy;&kcy;&ocy;&ncy;&chcy;&icy;&tcy;&iecy;, &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&iecy; &icy; &vcy;&ycy;&jcy;&dcy;&icy;&tcy;&iecy; &icy;&zcy; Vim &kcy;&acy;&kcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; (  <code>:wq</code>  ) &icy;&lcy;&icy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&rcy;&iecy;&rcy;&vcy;&acy;&tcy;&softcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy;, &vcy;&ycy;&jcy;&dcy;&icy;&tcy;&iecy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>:cq</code>  .</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_layout_configuration"><span data-i18n="e3b4832688ef36887514e1806940733ef6ce21b9d2b5a019224f90fde1cc9613/b3" data-source="Layout configuration" onmousemove="i18n(this)">Layout configuration</span></h4> <p><span data-i18n="53dfc8da56f8365acf895956300a18adfd575b476b1926a3266673452417ba3d/ad" data-source="You can change the windows layout used by Vim by setting configuration variable &lt;code&gt;mergetool.vimdiff.layout&lt;/code&gt; which accepts a string where the following separators have special meaning:" onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &mcy;&acy;&kcy;&iecy;&tcy; &ocy;&kcy;&ocy;&ncy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&mcy;&ycy;&jcy; Vim, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.vimdiff.layout</code> , &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&iecy;&tcy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&icy;&tcy;&iecy;&lcy;&icy; &icy;&mcy;&iecy;&yucy;&tcy; &ocy;&scy;&ocy;&bcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;:</span></p> <div> <ul> <li> <p><span data-i18n="a86e0a7a931f32ec2401728fccb41441cc751b5204adb2dc86d954230de53d7b/d1" data-source="&lt;code&gt;+&lt;/code&gt; is used to &amp;quot;open a new tab&amp;quot;" onmousemove="i18n(this)"><code>+</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy;  &quot;open a new tab&quot;</span></p> </li> <li> <p><span data-i18n="db58d49c90574b59816ccc2aa57165cae6b4a4c323312b98a6c5fbb326ddaf83/c9" data-source="&lt;code&gt;,&lt;/code&gt; is used to &amp;quot;open a new vertical split&amp;quot;" onmousemove="i18n(this)"><code>,</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy;  &quot;open a new vertical split&quot;</span></p> </li> <li> <p><span data-i18n="0e09cd6c33c7c7c3c0d99ab28e71099f0bcd4ab165806ad8e8467ced28d301d9/5a" data-source="&lt;code&gt;/&lt;/code&gt; is used to &amp;quot;open a new horizontal split&amp;quot;" onmousemove="i18n(this)"><code>/</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy;  &quot;open a new horizontal split&quot;</span></p> </li> <li> <p><span data-i18n="2c02adcae952ace9c70b8c714910808b5aae2e5c965cee89c444e6282867d797/fd" data-source="&lt;code&gt;@&lt;/code&gt; is used to indicate the file containing the final version after solving the conflicts. If not present, &lt;code&gt;MERGED&lt;/code&gt; will be used by default." onmousemove="i18n(this)"><code>@</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ocy;&bcy;&ocy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&acy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&iecy;&gcy;&ocy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ucy;&yucy; &vcy;&iecy;&rcy;&scy;&icy;&yucy; &pcy;&ocy;&scy;&lcy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;. &IEcy;&scy;&lcy;&icy; &iecy;&gcy;&ocy; &ncy;&iecy;&tcy;, &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy;  <code>MERGED</code> .</span></p> </li> </ul> </div> <p><span data-i18n="1be2f174102cfa3a396461ccfa202723c9660f350c326b7e36cd6d0fec59d2b2/9c" data-source="The precedence of the operators is as follows (you can use parentheses to change it):" onmousemove="i18n(this)">&Pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy; &ocy;&pcy;&iecy;&rcy;&acy;&tcy;&ocy;&rcy;&ocy;&vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy; (&vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&rcy;&ucy;&gcy;&lcy;&ycy;&iecy; &scy;&kcy;&ocy;&bcy;&kcy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy; &iecy;&gcy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy;):</span></p> <div> <div> <pre class="hljs language-go"><span class="hljs-string">`@`</span> &gt; <span class="hljs-string">`+`</span> &gt; <span class="hljs-string">`/`</span> &gt; <span class="hljs-string">`,`</span></pre> </div> </div> <p><span data-i18n="21df1a5ff3d80a767be4a411ef36b32b954735a09f1ceaf289b5c6ef86ef5fdf/b8" data-source="Let&amp;rsquo;s see some examples to understand how it works:" onmousemove="i18n(this)">&Dcy;&acy;&vcy;&acy;&jcy;&tcy;&iecy; &pcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&icy;&mcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&ocy;&vcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&ncy;&yacy;&tcy;&softcy;, &kcy;&acy;&kcy; &ecy;&tcy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy;:</span></p> <div> <ul> <li> <p><code>layout = &quot;(LOCAL,BASE,REMOTE)/MERGED&quot;</code></p> <div> <div> <p><span data-i18n="96b416fa669b405f013f65f392b33c0c927656bbc28934f4dd50b8e0756bfba4/c2" data-source="This is exactly the same as the default layout we have already seen." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &tcy;&ocy;&chcy;&ncy;&ocy; &tcy;&acy;&kcy; &zhcy;&iecy;, &kcy;&acy;&kcy; &mcy;&acy;&kcy;&iecy;&tcy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &mcy;&ycy; &ucy;&zhcy;&iecy; &vcy;&icy;&dcy;&iecy;&lcy;&icy;.</span></p> <p><span data-i18n="db2cd96f7dfcb65423fac0f9592f79f8e5f4eef9d5bdec2b08824668b52d9ef5/66" data-source="Note that &lt;code&gt;/&lt;/code&gt; has precedence over &lt;code&gt;,&lt;/code&gt; and thus the parenthesis are not needed in this case. The next layout definition is equivalent:" onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy;  <code>/</code>  &icy;&mcy;&iecy;&iecy;&tcy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy; &ncy;&acy;&dcy;  <code>,</code> , &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &scy;&kcy;&ocy;&bcy;&kcy;&icy; &vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ncy;&iecy; &ncy;&ucy;&zhcy;&ncy;&ycy;. &Scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &mcy;&acy;&kcy;&iecy;&tcy;&acy; &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ocy;:</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-attr">layout</span> = <span class="hljs-string">&quot;LOCAL,BASE,REMOTE / MERGED&quot;</span></pre> </div> </div> </div> </div> </li> <li> <p><code>layout = &quot;LOCAL,MERGED,REMOTE&quot;</code></p> <div> <div> <p><span data-i18n="330b292053c80f461e62353f761f35cc77a55aa97852e44c5f408759c37a198f/02" data-source="If, for some reason, we are not interested in the &lt;code&gt;BASE&lt;/code&gt; buffer." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&ocy; &kcy;&acy;&kcy;&icy;&mcy;-&tcy;&ocy; &pcy;&rcy;&icy;&chcy;&icy;&ncy;&acy;&mcy; &ncy;&acy;&scy; &ncy;&iecy; &icy;&ncy;&tcy;&iecy;&rcy;&iecy;&scy;&ucy;&iecy;&tcy; &bcy;&ucy;&fcy;&iecy;&rcy;  <code>BASE</code> .</span></p> <div> <div> <pre class="hljs language-markdown">------------------------------------------
|             |           |              |
|             |           |              |
|   LOCAL     |   MERGED  |   REMOTE     |
|             |           |              |
<span class="hljs-section">|             |           |              |
------------------------------------------</span></pre> </div> </div> </div> </div> </li> <li> <p><code>layout = &quot;MERGED&quot;</code></p> <div> <div> <p><span data-i18n="01b7de5ee1ee35452e644fbda1a5c8274ea9b54b13fe0ad13d398a39805514e8/a3" data-source="Only the &lt;code&gt;MERGED&lt;/code&gt; buffer will be shown. Note, however, that all the other ones are still loaded in vim, and you can access them with the &amp;quot;buffers&amp;quot; command." onmousemove="i18n(this)">&Bcy;&ucy;&dcy;&iecy;&tcy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&ncy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &bcy;&ucy;&fcy;&iecy;&rcy;  <code>MERGED</code> . &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &ucy;&chcy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy; &vcy;&scy;&iecy; &ocy;&scy;&tcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &pcy;&ocy;-&pcy;&rcy;&iecy;&zhcy;&ncy;&iecy;&mcy;&ucy; &zcy;&acy;&gcy;&rcy;&ucy;&zhcy;&iecy;&ncy;&ycy; &vcy; vim, &icy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy;&softcy; &kcy; &ncy;&icy;&mcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  &quot;buffers&quot; .</span></p> <div> <div> <pre class="hljs language-markdown">------------------------------------------
|                                        |
|                                        |
|                 MERGED                 |
|                                        |
<span class="hljs-section">|                                        |
------------------------------------------</span></pre> </div> </div> </div> </div> </li> <li> <p><code>layout = &quot;@LOCAL,REMOTE&quot;</code></p> <div> <div> <p><span data-i18n="5f362e2ae9be121f0361b603782439e51a7c39624b0fd1f76d6f21f5bc5867b0/73" data-source="When &lt;code&gt;MERGED&lt;/code&gt; is not present in the layout, you must &amp;quot;mark&amp;quot; one of the buffers with an asterisk. That will become the buffer you need to edit and save after resolving the conflicts." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  <code>MERGED</code>  &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &vcy; &mcy;&acy;&kcy;&iecy;&tcy;&iecy;, &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy;  &quot;mark&quot;  &vcy; &ocy;&dcy;&ncy;&ocy;&mcy; &icy;&zcy; &bcy;&ucy;&fcy;&iecy;&rcy;&ocy;&vcy; &scy;&ocy; &zcy;&vcy;&iecy;&zcy;&dcy;&ocy;&chcy;&kcy;&ocy;&jcy;. &Ecy;&tcy;&ocy; &scy;&tcy;&acy;&ncy;&iecy;&tcy; &bcy;&ucy;&fcy;&iecy;&rcy;&ocy;&mcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &vcy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &ocy;&tcy;&rcy;&iecy;&dcy;&acy;&kcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy; &pcy;&ocy;&scy;&lcy;&iecy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy;.</span></p> <div> <div> <pre class="hljs language-markdown">------------------------------------------
|                   |                    |
|                   |                    |
|                   |                    |
|     LOCAL         |    REMOTE          |
|                   |                    |
|                   |                    |
<span class="hljs-section">|                   |                    |
------------------------------------------</span></pre> </div> </div> </div> </div> </li> <li> <p><code>layout = &quot;LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE&quot;</code></p> <div> <div> <p><span data-i18n="3fa1cdd0550627a89a943179c7be5297e0f5073b584cf103ac2a246c98cb1514/5c" data-source="Three tabs will open: the first one is a copy of the default layout, while the other two only show the differences between (&lt;code&gt;BASE&lt;/code&gt; and &lt;code&gt;LOCAL&lt;/code&gt;) and (&lt;code&gt;BASE&lt;/code&gt; and &lt;code&gt;REMOTE&lt;/code&gt;) respectively." onmousemove="i18n(this)">&Ocy;&tcy;&kcy;&rcy;&ocy;&iecy;&tcy;&scy;&yacy; &tcy;&rcy;&icy; &vcy;&kcy;&lcy;&acy;&dcy;&kcy;&icy;: &pcy;&iecy;&rcy;&vcy;&acy;&yacy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy; &kcy;&ocy;&pcy;&icy;&yucy; &mcy;&acy;&kcy;&iecy;&tcy;&acy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;, &acy; &dcy;&vcy;&iecy; &dcy;&rcy;&ucy;&gcy;&icy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&yucy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy; (  <code>BASE</code>  &icy;  <code>LOCAL</code>  ) &icy; (  <code>BASE</code>  &icy;  <code>REMOTE</code>  ) &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;.</span></p> <div> <div> <pre class="hljs language-markdown">------------------------------------------
<span class="hljs-section">| <span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">TAB</span> #<span class="hljs-attr">1</span>&gt;</span></span> |  TAB #2  |  TAB #3  |       |
------------------------------------------</span>
|             |           |              |
|   LOCAL     |   BASE    |   REMOTE     |
<span class="hljs-section">|             |           |              |
------------------------------------------</span>
|                                        |
|                MERGED                  |
<span class="hljs-section">|                                        |
------------------------------------------</span></pre> </div> </div> <div> <div> <pre class="hljs language-markdown">------------------------------------------
<span class="hljs-section">|  TAB #1  | <span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">TAB</span> #<span class="hljs-attr">2</span>&gt;</span></span> |  TAB #3  |       |
------------------------------------------</span>
|                   |                    |
|                   |                    |
|                   |                    |
|     BASE          |    LOCAL           |
|                   |                    |
|                   |                    |
<span class="hljs-section">|                   |                    |
------------------------------------------</span></pre> </div> </div> <div> <div> <pre class="hljs language-markdown">------------------------------------------
<span class="hljs-section">|  TAB #1  |  TAB #2  | <span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">TAB</span> #<span class="hljs-attr">3</span>&gt;</span></span> |       |
------------------------------------------</span>
|                   |                    |
|                   |                    |
|                   |                    |
|     BASE          |    REMOTE          |
|                   |                    |
|                   |                    |
<span class="hljs-section">|                   |                    |
------------------------------------------</span></pre> </div> </div> </div> </div> </li> <li> <p><code>layout = &quot;LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED&quot;</code></p> <div> <div> <p><span data-i18n="842867147cfff4f43aa81892b9bb4774f1002bbeebc0da3175ba68e18cf2b3aa/15" data-source="Same as the previous example, but adds a fourth tab with the same information as the first tab, with a different layout." onmousemove="i18n(this)">&Tcy;&ocy; &zhcy;&iecy;, &chcy;&tcy;&ocy; &icy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&icy;&jcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ncy;&ocy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &chcy;&iecy;&tcy;&vcy;&iecy;&rcy;&tcy;&ucy;&yucy; &vcy;&kcy;&lcy;&acy;&dcy;&kcy;&ucy; &scy; &tcy;&ocy;&jcy; &zhcy;&iecy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&iecy;&jcy;, &chcy;&tcy;&ocy; &icy; &pcy;&iecy;&rcy;&vcy;&acy;&yacy; &vcy;&kcy;&lcy;&acy;&dcy;&kcy;&acy;, &ncy;&ocy; &scy; &dcy;&rcy;&ucy;&gcy;&icy;&mcy; &mcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy;.</span></p> <div> <div> <pre class="hljs language-markdown">---------------------------------------------
<span class="hljs-section">|  TAB #1  |  TAB #2  |  TAB #3  | <span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">TAB</span> #<span class="hljs-attr">4</span>&gt;</span></span> |
---------------------------------------------</span>
|       LOCAL         |                     |
|---------------------|                     |
|       BASE          |        MERGED       |
|---------------------|                     |
<span class="hljs-section">|       REMOTE        |                     |
---------------------------------------------</span></pre> </div> </div> <p><span data-i18n="47db17fb4705d48088ea76120da08e6db61a9ee4ad2b09ef2df7526797b767dd/a4" data-source="Note how in the third tab definition we need to use parentheses to make &lt;code&gt;,&lt;/code&gt; have precedence over &lt;code&gt;/&lt;/code&gt;." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &vcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&icy; &tcy;&rcy;&iecy;&tcy;&softcy;&iecy;&jcy; &vcy;&kcy;&lcy;&acy;&dcy;&kcy;&icy; &ncy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&rcy;&ucy;&gcy;&lcy;&ycy;&iecy; &scy;&kcy;&ocy;&bcy;&kcy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy;  <code>,</code>  &icy;&mcy;&iecy;&lcy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy; &ncy;&acy;&dcy;  <code>/</code> .</span></p> </div> </div> </li> </ul> </div> </div> <div> <h4 class="text-body-emphasis"  id="_variants"><span data-i18n="63d2643b059ee912fde1a2395209738f9c3056cdad2acd87b583dbc77b4cf786/69" data-source="Variants" onmousemove="i18n(this)">Variants</span></h4> <p><span data-i18n="ef67d05c158b7ead479d3454149156fe6a79517e1838c0c9278f6915840b5bcc/b8" data-source="Instead of &lt;code&gt;--tool=vimdiff&lt;/code&gt;, you can also use one of these other variants:" onmousemove="i18n(this)">&Vcy;&mcy;&iecy;&scy;&tcy;&ocy;  <code>--tool=vimdiff</code>  &vcy;&ycy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ocy;&dcy;&icy;&ncy; &icy;&zcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&khcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ocy;&vcy;:</span></p> <div> <ul> <li> <p><span data-i18n="76c365786f027b1bb2047d5212e9d1c7c7bdd88427c82dcb1f48a11e36c5058e/c7" data-source="&lt;code&gt;--tool=gvimdiff&lt;/code&gt;, to open gVim instead of Vim." onmousemove="i18n(this)"><code>--tool=gvimdiff</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&tcy;&kcy;&rcy;&ycy;&tcy;&softcy; gVim &vcy;&mcy;&iecy;&scy;&tcy;&ocy; Vim.</span></p> </li> <li> <p><span data-i18n="5bb85b15bd363bc2371848376281e3b26bcc6a643f850a7e351b17577084abf7/5f" data-source="&lt;code&gt;--tool=nvimdiff&lt;/code&gt;, to open Neovim instead of Vim." onmousemove="i18n(this)"><code>--tool=nvimdiff</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&tcy;&kcy;&rcy;&ycy;&tcy;&softcy; Neovim &vcy;&mcy;&iecy;&scy;&tcy;&ocy; Vim.</span></p> </li> </ul> </div> <p><span data-i18n="b7c6522a8a85f6ee79ed262a5775cec1c02f35b22bc176d24e5988f28a3a0111/d8" data-source="When using these variants, in order to specify a custom layout you will have to set configuration variables &lt;code&gt;mergetool.gvimdiff.layout&lt;/code&gt; and &lt;code&gt;mergetool.nvimdiff.layout&lt;/code&gt; instead of &lt;code&gt;mergetool.vimdiff.layout&lt;/code&gt;" onmousemove="i18n(this)">&Pcy;&rcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy; &ecy;&tcy;&icy;&khcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ocy;&vcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &mcy;&acy;&kcy;&iecy;&tcy;, &vcy;&acy;&mcy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.gvimdiff.layout</code>  &icy;  <code>mergetool.nvimdiff.layout</code>  &vcy;&mcy;&iecy;&scy;&tcy;&ocy;  <code>mergetool.vimdiff.layout</code> .</span></p> <p><span data-i18n="54975070cc25cd5b38eb76ea6f786ea8233322e571ae2313e5a67cdfc655f6d2/95" data-source="In addition, for backwards compatibility with previous Git versions, you can also append &lt;code&gt;1&lt;/code&gt;, &lt;code&gt;2&lt;/code&gt; or &lt;code&gt;3&lt;/code&gt; to either &lt;code&gt;vimdiff&lt;/code&gt; or any of the variants (ex: &lt;code&gt;vimdiff3&lt;/code&gt;, &lt;code&gt;nvimdiff1&lt;/code&gt;, etc&amp;hellip;&amp;ZeroWidthSpace;) to use a predefined layout. In other words, using &lt;code&gt;--tool=[g,n,]vimdiffx&lt;/code&gt; is the same as using &lt;code&gt;--tool=[g,n,]vimdiff&lt;/code&gt; and setting configuration variable &lt;code&gt;mergetool.[g,n,]vimdiff.layout&lt;/code&gt; to&amp;hellip;&amp;ZeroWidthSpace;" onmousemove="i18n(this)">&Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &dcy;&lcy;&yacy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &scy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&icy;&mcy;&icy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;&mcy;&icy;  Git  &vcy;&ycy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &dcy;&ocy;&bcy;&acy;&vcy;&icy;&tcy;&softcy;  <code>1</code> ,  <code>2</code>  &icy;&lcy;&icy;  <code>3</code>  &kcy;  <code>vimdiff</code>  &icy;&lcy;&icy; &kcy; &lcy;&yucy;&bcy;&ocy;&mcy;&ucy; &icy;&zcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&ocy;&vcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:  <code>vimdiff3</code> ,  <code>nvimdiff1</code>  &icy; &tcy;. &dcy;.), &chcy;&tcy;&ocy;&bcy;&ycy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &pcy;&rcy;&iecy;&dcy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &mcy;&acy;&kcy;&iecy;&tcy;. &Dcy;&rcy;&ucy;&gcy;&icy;&mcy;&icy; &scy;&lcy;&ocy;&vcy;&acy;&mcy;&icy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;  <code>--tool=[g,n,]vimdiffx</code>  &acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yucy;  <code>--tool=[g,n,]vimdiff</code>  &icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>mergetool.[g,n,]vimdiff.layout</code>  &vcy;&hellip;&ZeroWidthSpace;</span></p> <div> <ul> <li> <p><span data-i18n="36b9cc7f324043c08f8f28215cefe2cb0d41be42d89bb72e860a084cdc8075fd/49" data-source="&lt;code&gt;x=1&lt;/code&gt;: &lt;code&gt;&amp;quot;@LOCAL, REMOTE&amp;quot;&lt;/code&gt;" onmousemove="i18n(this)"><code>x=1</code>  :  <code>&quot;@LOCAL, REMOTE&quot;</code></span></p> </li> <li> <p><span data-i18n="3668aecf0977b8257d70a48ea0ff3f3f023c105987513fb85394bd9483d346f9/f9" data-source="&lt;code&gt;x=2&lt;/code&gt;: &lt;code&gt;&amp;quot;LOCAL, MERGED, REMOTE&amp;quot;&lt;/code&gt;" onmousemove="i18n(this)"><code>x=2</code>  :  <code>&quot;LOCAL, MERGED, REMOTE&quot;</code></span></p> </li> <li> <p><span data-i18n="36c3891e4497b06b63e271f307811b03ff2c2f30f60f2135d0a3f39ba246d917/e5" data-source="&lt;code&gt;x=3&lt;/code&gt;: &lt;code&gt;&amp;quot;MERGED&amp;quot;&lt;/code&gt;" onmousemove="i18n(this)"><code>x=3</code>: <code>&quot;MERGED&quot;</code></span></p> </li> </ul> </div> <p><span data-i18n="926e7867315de3ddc5f418a0a60c41e468fc011b29d749f50bdf96c5c2b278ad/5d" data-source="Example: using &lt;code&gt;--tool=gvimdiff2&lt;/code&gt; will open &lt;code&gt;gvim&lt;/code&gt; with three columns (LOCAL, MERGED and REMOTE)." onmousemove="i18n(this)">&Pcy;&rcy;&icy;&mcy;&iecy;&rcy;: &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;  <code>--tool=gvimdiff2</code>  &ocy;&tcy;&kcy;&rcy;&ocy;&iecy;&tcy;  <code>gvim</code>  &scy; &tcy;&rcy;&iecy;&mcy;&yacy; &scy;&tcy;&ocy;&lcy;&bcy;&tscy;&acy;&mcy;&icy; (LOCAL, MERGED &icy; REMOTE).</span></p> </div> </div> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/git-mergetool">https://git-scm.com/docs/git-mergetool</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                            <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mktag.html">
                            git mktag                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mktree.html">
                            git mktree                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-multi-pack-index.html">
                            git multi-pack-index                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-mv.html">
                            git mv                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-name-rev.html">
                            git name-rev                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-notes.html">
                            git notes                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="git-p4.html">
                            git p4                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                   <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="git-mergetool.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>